Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 15 Aug 2011 18:49:29 +0000 (11:49 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 15 Aug 2011 18:49:29 +0000 (11:49 -0700)

Trivial merge